Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:34:49 +0000 (18:34 -0700)
commitbd41d1b717a1f57fa2b6df451085c28cde4a1871
tree77aa72f7092f4b8e292b08a41c0204396753db9d
parent8c417db4aee7fe00a76790aabb8fe70865676acb
parent6aedbea9ec4dcb52ccf5ac6f998d9081223a6706
Merge from trunk.
src/ChangeLog